Merge remote-tracking branch 'savannah/master' into native-comp

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/help.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc src/image.c
Simple merge